From: Jan Djärv Date: Fri, 27 Aug 2004 16:57:36 +0000 (+0000) Subject: * xmenu.c (set_frame_menubar): Reintroduce inhibit_garbage_collection X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~21271 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1ddc9473d49bb2301d9f633b0714ff3efd3551d7;p=emacs.git * xmenu.c (set_frame_menubar): Reintroduce inhibit_garbage_collection from 1.233 so that strings from ENCODE_UTF_8 isn't GC:ed before used. --- diff --git a/src/ChangeLog b/src/ChangeLog index 6f2e3cb432f..2d914eec6f3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2004-08-27 Jan Dj,Ad(Brv + * xmenu.c (set_frame_menubar): Reintroduce inhibit_garbage_collection + from 1.233 so that strings from ENCODE_UTF_8 isn't GC:ed before used. + * gtkutil.c (xg_create_frame_widgets): Compensate for tool bar when tool bar items is 0. diff --git a/src/xmenu.c b/src/xmenu.c index 473e29de88d..7ef0e8c857d 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1930,6 +1930,7 @@ set_frame_menubar (f, first_time, deep_p) FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); items = FRAME_MENU_BAR_ITEMS (f); + inhibit_garbage_collection (); /* Save the frame's previous menu bar contents data. */ if (previous_menu_items_used)